* vc-hg.el (vc-hg-next-revision): Ensure use of default "tip" output format

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 02d5f15e42c886349ee92f1debe77b38dc31caa0..2183711e9bd54b1656758b6d41ecebb513b823ab 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-01  Kirk Kelsey  <kirk.kelsey@0x4b.net>
+
+       * vc/vc-hg.el (vc-hg-next-revision):
+       Ensure use of default "tip" output format.  (Bug#6968)
+
 2012-12-01  Kim F. Storm  <storm@cua.dk>
 
        * startup.el (fancy-startup-tail): Add a clickable link

diff --git a/lisp/ChangeLog.15 b/lisp/ChangeLog.15
index 9dd4af069e6fd846b184f20ab48b8accb1b271ef..f82974422ede849009722e25def5116d5c06fc85 100644 (file)
--- a/lisp/ChangeLog.15
+++ b/lisp/ChangeLog.15
@@ -7979,7 +7979,7 @@
        Remember the buffers at head, rather than their name.
        * iswitchb.el (iswitchb-kill-buffer): Re-make the list.
 
-2010-08-22  Kirk Kelsey  <kirk.kelsey@0x4b.net>  (tiny change)
+2010-08-22  Kirk Kelsey  <kirk.kelsey@0x4b.net>
             Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * progmodes/make-mode.el (makefile-fill-paragraph): Account for the

diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el
index 727fb08e38846296d119b2b1a158749528952207..50678fad075b53b3395915b28e0111008f337a6e 100644 (file)
--- a/lisp/vc/vc-hg.el
+++ b/lisp/vc/vc-hg.el
@@ -384,7 +384,7 @@ Optional arg REVISION is a revision to annotate from."
   (let ((newrev (1+ (string-to-number rev)))
         (tip-revision
          (with-temp-buffer
-           (vc-hg-command t 0 nil "tip")
+           (vc-hg-command t 0 nil "tip" "--style=default")
            (goto-char (point-min))
            (re-search-forward "^changeset:[ \t]*\\([0-9]+\\):")
            (string-to-number (match-string-no-properties 1)))))